From 9bce395d7dab0e6efee1a7e639c3d17b6f35e12c Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Fri, 22 Mar 2024 11:38:31 -0500 Subject: [PATCH] Use new attrs syntax --- src/pgwui_bulk_upload/views/bulk_upload.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pgwui_bulk_upload/views/bulk_upload.py b/src/pgwui_bulk_upload/views/bulk_upload.py index a5e0264..633fc18 100644 --- a/src/pgwui_bulk_upload/views/bulk_upload.py +++ b/src/pgwui_bulk_upload/views/bulk_upload.py @@ -19,7 +19,7 @@ # from pyramid.view import view_config -import attr +import attrs import logging import os import os.path @@ -170,16 +170,16 @@ class UploadBulkData(UploadData): yield from super()._thunk() -@attr.s +@attrs.define(slots=False) class UploadDir(): '''Uploaded archive directory It is iterable, consisting of SaveBulkLine instances ''' - uf = attr.ib() - dentry = attr.ib() - map_file = attr.ib() - filedata = attr.ib(factory=list) + uf = attrs.field() + dentry = attrs.field() + map_file = attrs.field() + filedata = attrs.field(factory=list) def get_file_map(self, yaml_file): try: @@ -403,14 +403,14 @@ class UploadDir(): yield (fileinfo.filepath, fileinfo.lineno, fileinfo.relation) -@attr.s +@attrs.define(slots=False) class UploadArchive(): '''Uploaded archive It is iterable, consisting of UploadDir instances ''' - lineno = attr.ib(default=0) - updirs = attr.ib(factory=list) + lineno = attrs.field(default=0) + updirs = attrs.field(factory=list) def open(self, uf, zip_root, map_file): ''' -- 2.34.1